c0921b
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.security.ldap.server;
 
 import java.io.File;
@@ -50,6 +65,7 @@
import org.springframework.util.Assert;
  * framework public API.
  *
  * @author Luke Taylor
+ * @author Rob Winch
  */
 public class ApacheDSContainer implements InitializingBean, DisposableBean, Lifecycle, ApplicationContextAware {
     private final Log logger = LogFactory.getLog(getClass());
@@ -162,8 +178,7 @@
public class ApacheDSContainer implements InitializingBean, DisposableBean, Life
             service.startup();
             server.start();
         } catch (Exception e) {
-            logger.error("Server startup failed ", e);
-            return;
+            throw new RuntimeException("Server startup failed", e);
         }
 
         try {
